Clean up _gtk_tree_view_column_cell_event

diff --git a/gtk/gtktreeprivate.h b/gtk/gtktreeprivate.h
index 6cb1ffcae1007570ae567b838c97bae0b4769dfd..695e06d6aa6c558fa2427f5ff7c85195cac7b75a 100644 (file)
--- a/gtk/gtktreeprivate.h
+++ b/gtk/gtktreeprivate.h
@@ -117,10 +117,7 @@ void _gtk_tree_view_column_start_drag       (GtkTreeView       *tree_view,
                                             GtkTreeViewColumn *column,
                                              GdkDevice         *device);
 gboolean _gtk_tree_view_column_cell_event   (GtkTreeViewColumn  *tree_column,
-                                            GtkCellEditable   **editable_widget,
                                             GdkEvent           *event,
-                                            gchar              *path_string,
-                                            const GdkRectangle *background_area,
                                             const GdkRectangle *cell_area,
                                             guint               flags);
 gboolean          _gtk_tree_view_column_has_editable_cell(GtkTreeViewColumn  *column);

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2d16f468b7aa1f04f9d20b714bd76c2ab9823939..8272fbcd53f9e71bf4d1e3ce60e1ae62ce0779f2 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -3155,10 +3155,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
              guint flags = 0;
 
              if (_gtk_tree_view_column_cell_event (column,
-                                                    NULL,
                                                    (GdkEvent *)event,
-                                                   NULL,
-                                                   &background_area,
                                                    &cell_area, flags))
                {
                  GtkCellArea *area = gtk_cell_layout_get_area (GTK_CELL_LAYOUT (column));

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 1fa4cf0bb69d2549674bb5c4752e30864396792f..bf1679e3b58cc8761f2e7258e1a0553653fcefc9 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -2776,10 +2776,7 @@ _gtk_tree_view_column_cell_render (GtkTreeViewColumn  *tree_column,
 
 gboolean
 _gtk_tree_view_column_cell_event (GtkTreeViewColumn  *tree_column,
-                                 GtkCellEditable   **editable_widget,
                                  GdkEvent           *event,
-                                 gchar              *path_string,
-                                 const GdkRectangle *background_area,
                                  const GdkRectangle *cell_area,
                                  guint               flags)
 {
@@ -2789,20 +2786,6 @@ _gtk_tree_view_column_cell_event (GtkTreeViewColumn  *tree_column,
 
   priv = tree_column->priv;
 
-  /* FIXME: Should we pass background area here as well?
-   * What will happen to the path_string and editable widget
-   * variables?
-   *
-   * Answer, No dont pass background area... editable widgets
-   * grab the pointer and keyboard so the treeview doesnt 
-   * recieve these events while editable widgets are editing.
-   *
-   * Also it's important that gtk_cell_area_apply_attributes be
-   * called before passing the event to the cell (maybe we need to 
-   * instead use the path_string here to apply the attributes ?, 
-   * if the attributes are applied, the underlying CellArea knows
-   * the path string, which is expected when handling events).
-   */
   return gtk_cell_area_event (priv->cell_area,
                               priv->cell_area_context,
                               priv->tree_view,